From: Florian Müllner <fmuellner@gnome.org>
Date: Thu, 17 May 2012 14:11:54 +0000 (+0200)
Subject: Remove SessionType type
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~6553
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=e49b94658cbb0c451bb4fa9bc6f91bdd959be3e8;p=gnome-shell.git

Remove SessionType type

SessionType has now completely been replaced by the finer-grained
session-mode, so remove the remaining type definition.

https://bugzilla.gnome.org/show_bug.cgi?id=676156
---

diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js
index ed6eaa2e9..dd36873c3 100644
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Lang = imports.lang;
-const Shell = imports.gi.Shell;
 
 const Config = imports.misc.config;
 const Main = imports.ui.main;
@@ -53,8 +52,8 @@ const _modes = {
                      'keyboard': imports.ui.status.keyboard.XKBIndicator,
                      'powerMenu': imports.gdm.powerMenu.PowerMenuButton
                  }
-             },
-             sessionType: Shell.SessionType.GDM },
+             }
+           },
 
     'user': { hasOverview: true,
               hasAppMenu: true,
@@ -72,8 +71,8 @@ const _modes = {
                       'network', 'battery', 'userMenu'
                   ],
                   implementation: STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION
-              },
-              sessionType: Shell.SessionType.USER }
+              }
+            }
 };
 
 function modeExists(mode) {
diff --git a/src/shell-global.h b/src/shell-global.h
index 41c21613c..4d92995c9 100644
--- a/src/shell-global.h
+++ b/src/shell-global.h
@@ -141,11 +141,6 @@ void     shell_global_reexec_self               (ShellGlobal  *global);
 
 void     shell_global_launch_calendar_server    (ShellGlobal  *global);
 
-typedef enum {
-  SHELL_SESSION_USER,
-  SHELL_SESSION_GDM
-} ShellSessionType;
-
 const char *     shell_global_get_session_mode  (ShellGlobal  *global);
 
 G_END_DECLS